From: kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Date: Sun, 27 Jun 2004 08:32:57 +0000 (+0000)
Subject: bitkeeper revision 1.1019 (40de8639yjRdZbQS_JrcVsHsaPIwZw)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~18102
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f6f1621f7e47eefbfe675dfc2fa2916ffcd138e2;p=xen.git

bitkeeper revision 1.1019 (40de8639yjRdZbQS_JrcVsHsaPIwZw)

smp.h, irq.h, config.h, sched_bvt.c, setup.c, pci-pc.c:
  Fix compile errors for latest GCC (3.4.0).
---

diff --git a/xen/arch/x86/pci-pc.c b/xen/arch/x86/pci-pc.c
index 488fab9172..575c3312f2 100644
--- a/xen/arch/x86/pci-pc.c
+++ b/xen/arch/x86/pci-pc.c
@@ -1020,12 +1020,12 @@ struct irq_routing_table * __devinit pcibios_get_irq_routing_table(void)
 		"xor %%ah, %%ah\n"
 		"1:"
 		: "=a" (ret),
-		  "=b" (map),
-		  "+m" (opt)
+		  "=b" (map)
 		: "0" (PCIBIOS_GET_ROUTING_OPTIONS),
 		  "1" (0),
-		  "D" ((long) &opt),
-		  "S" (&pci_indirect));
+		  "D" (&opt),
+		  "S" (&pci_indirect)
+                : "memory");
 	DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
 	if (ret & 0xff00)
 		printk(KERN_ERR "PCI: Error %02x when fetching IRQ routing table.\n", (ret >> 8) & 0xff);
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 2e450497d4..ec803472fc 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -16,6 +16,15 @@
 #include <asm/domain_page.h>
 #include <asm/pdb.h>
 
+extern void init_IRQ(void);
+extern void trap_init(void);
+extern void time_init(void);
+extern void ac_timer_init(void);
+extern void initialize_keytable();
+extern int opt_nosmp, opt_watchdog, opt_noacpi;
+extern int opt_ignorebiostables, opt_noht;
+extern int do_timer_lists_from_pit;
+
 char ignore_irq13;		/* set if exception 16 works */
 struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1 };
 
@@ -96,8 +105,6 @@ void __init get_cpu_vendor(struct cpuinfo_x86 *c)
 
 static void __init init_intel(struct cpuinfo_x86 *c)
 {
-    extern int opt_noht, opt_noacpi;
-
     /* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it */
     if ( c->x86 == 6 && c->x86_model < 3 && c->x86_mask < 3 )
         clear_bit(X86_FEATURE_SEP, &c->x86_capability);
@@ -300,13 +307,6 @@ unsigned long pci_mem_start = 0x10000000;
 
 void __init start_of_day(void)
 {
-    extern void init_IRQ(void);
-    extern void trap_init(void);
-    extern void time_init(void);
-    extern void ac_timer_init(void);
-    extern void initialize_keytable();
-    extern int opt_nosmp, opt_watchdog, opt_noacpi, opt_ignorebiostables;
-    extern int do_timer_lists_from_pit;
     unsigned long low_mem_size;
     
 #ifdef MEMORY_GUARD
diff --git a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c
index afc0a6e5a6..6ea9503c70 100644
--- a/xen/common/sched_bvt.c
+++ b/xen/common/sched_bvt.c
@@ -96,7 +96,8 @@ static void __calc_evt(struct bvt_dom_info *inf)
  */
 int bvt_alloc_task(struct domain *p)
 {
-    if ( (BVT_INFO(p) = kmem_cache_alloc(dom_info_cache)) == NULL )
+    p->sched_priv = kmem_cache_alloc(dom_info_cache);
+    if ( p->sched_priv == NULL )
         return -1;
     
     return 0;
@@ -410,8 +411,8 @@ int bvt_init_scheduler()
 
     for ( i = 0; i < NR_CPUS; i++ )
     {
-        CPU_INFO(i) = kmalloc(sizeof(struct bvt_cpu_info));
-        if ( CPU_INFO(i) == NULL )
+        schedule_data[i].sched_priv = kmalloc(sizeof(struct bvt_cpu_info));
+        if ( schedule_data[i].sched_priv == NULL )
         {
             printk("Failed to allocate BVT scheduler per-CPU memory!\n");
             return -1;
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 473f69fd35..053b0ef56c 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -62,7 +62,6 @@
 #define SLACK_DOMAIN_MEM_KILOBYTES 2048
 
 /* Linkage for x86 */
-#define FASTCALL(x)     x __attribute__((regparm(3)))
 #define asmlinkage        __attribute__((regparm(0)))
 #define __ALIGN .align 16,0x90
 #define __ALIGN_STR ".align 16,0x90"
diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 36bd17bd03..7c5212e50f 100644
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -66,7 +66,7 @@ extern void enable_8259A_irq(unsigned int irq);
 extern int i8259A_irq_pending(unsigned int irq);
 extern void make_8259A_irq(unsigned int irq);
 extern void init_8259A(int aeoi);
-extern void FASTCALL(send_IPI_self(int vector));
+extern void send_IPI_self(int vector);
 extern void init_VISWS_APIC_irqs(void);
 extern void setup_IO_APIC(void);
 extern void disable_IO_APIC(void);
diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index b0f39112ce..d7f71b6fae 100644
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -22,7 +22,7 @@
  */
 extern void smp_send_stop(void);
 
-extern void FASTCALL(smp_send_event_check_mask(unsigned long cpu_mask));
+extern void smp_send_event_check_mask(unsigned long cpu_mask);
 #define smp_send_event_check_cpu(_cpu) smp_send_event_check_mask(1<<(_cpu))
 
 /*